Refactored ActiveRecordCriteria namespace