RT fix.
Server refactoring.