Changed datamodel for keywords and related
Horrible surgery to rationalise DM