Adding more features to build system.