Added parsing of return variables