Chnage method used in model to make it
more efficient database-wise
Add additional spec