Added data structure funtionality