Add support for build id