Switched to mutable dictionary for dynamic data