Shell hook support added