Removed interface OptionalXContentHolder in favour of simply using ToXContent