Adding context and user switching