Change to using Service and Registration structs.