Added support for selector expressions