More work on updating build system