Started moving some code over from Relaxed Web Services module