Move defines in private attributes
Use a fixed model for event parsing