Support changes in build system