Add statement lists and switch cases