Simplify some ifs
Reform registration: OBJECTS