Added support for specifying cursor