Added data and config system