Added switches