Additional dashbuilder repo added
Refactor to support the latest changes on dashbuilder