Added support for a director