Rewrite structure of models to return propert interface.  Ensure dependcy injection works