better context handling in server facade