Added further improvements for build process