Refactored ActiveRecord namespace, added IdentityAwareTrait