issue 3
Updated Parser interface