[WIP] Improved build configuration III