Replace service to return promise