Added MAKE support