Expand service implementation