Features/build process improvements