Added basic data components