Added expression evaluation functionality