Added switches field