Finalized all the changes with project properties