Update to work with build system