Add checks for objects