Implemented new build system