Modify due to the changes of service returned type.