Got rid of model-mommy dependency