Some better naming, auto loading of models