Modified parsing module