Update service to return list instead of single entity

Update service to return list instead of single entity