Fixed bug with router & cleaned up adaptModel/contentObjectModel