Added Template Building
Libraries fix