Improve development mode