Dropped BlockFactory, added Object factory, refactored CanaryBlock