Updated object definition check