Update to support the use of EB_SUPPORT_FOLDER