Reworked build target