Refactored using jms/parser-lib
Added support for property access