Refcatoring
Add dictionaries