Added data sourcing and included BD's template sets