Adapt to Collage API change
Resolve todo
Use deregister from objectMap
Fix build