Implementing a new persistence layer and introducing a service layer.
Both are not in use at the moment and not really tested right now.