Fixed namespaces.
Configuration.
Checkpoint.