Improve project model syntax