Changed return type of Builder to return correct type