Moved the rest to ThingPageFactory