Removed ActiveRecord dependency