Improved dev environment