Update and current preferred data structures #2