Added switches and doors