Switch-case update