Added Struct functionality