Added proper parsing of numerical expressions