Added build_host and build_service