Updated to simplified BuildValue approach