Removed activerecord dependency