Updating build script with more granular tasks