Added support for Hector