Added basic data components, in a proposed organization