Changed Dictionary syntax for better performance