Feature/improve data structure