Updated Template lib to match Config object