Enhanced the object validator