align ModelManager to the ModelManagerInterface

fix for #158

/cc @sjopet @dbu