Add search checks and check object types