Renamed Service correctly and aded documentation