Add deeper labelmask support