Improve development experience