Simplified the view models' structure into returning a simple object instead of an instance of a function