Added temptative data structures