Add advanced parser rules