Fixed Datastructure return values