Fix missing mappings
Move some code to CompCore