Added basic data structure