Added wp2 output schema