Refactored demo parser