Add some changes to project logic