Added "object" and "boolean" type checks