Service - added javadocs, modified return values of some methods