Added support for ROOTSUBDIR