Parser - update for testing purposes