Service updated, comments added