Added even more changes to CRP v2
More changes