Removed dependency on ActiveRecord