Fixed dependency on activerecord