refactoring to support minimalist records schema and cinergi records schema