Parser: added if-else