Added: Controller, Self and Server, not yet tested