Model should now return the correct data