Implemented new Model-API everywhere