Added username passing to DataStructureHandler