First bunch of changes for RD-Connect DCC data model
More changes, renaming and so