Added attribute checks