Added new datamembers (bug fix from last commit)