Case statements added