Updated to include New Changeset functionality