Added pre-parser structure