Added metrics and build specific changes