Case when support added + various fixes