Continued custom model, added more to mock