O'Neill is set for a return to action next year having signed a new long-term contract.