Core classes updated to latest from CRVM