improved data structures (only references)