Improved some funcionality for dev env