Reworked models to fit latest objectology changes