add elif support