UPDATE: Better if criteria for BaseObject