improving data structure support