Added ActiveModel support