Build system support