updated MapR-related parts