Changed the way of getting build id