Log annotation.

* Refactored some code.
* More tests included
* services only are included annotation is active