Build system update