Fix TOU lockout; remove need to pass DomainType in API methods