Added better projection and change support