Updated with CRMV core