Add support for elsif