Updated to RC, data model cleanup