Some more refactoring
Checkpoint - DefinitionReader implemented