Change from init() checking classes to checking objects