Added helper classes for parser and logic