Added data-structures