add extra support for property selection