Update Build to include more templating and user properties.