Refactoring of the basics; additional service-functions added