Updated to use service