Reworking build tasks