Switch to mutable data structures