Add static dictionary support - still work in progress