Added is_visible and is_deleted fields