Made build-module architecture independent