Added buildTag method