Reworked build system