Servator 2.1 - First set of changes