Added switches that were forgotten