Added support for $select