migrating classes from data namespace. Documentation is somewhat poor in these.