Changed service behavior a little bit. Some refactoring made. Code cleaned.