Re-working the build system part