Initial update with toy data structures