Improve project create a bit more