Fixed header to use new communication model.
Fixed registration.