Constructor shouldn't have required 2 elements to be passed in, as they aren't required per HV standards. These are now optional.