Adjust project schema as per feedback from @osbornm