Did more work on service implementation