Added expression handler support
Added PEG types