Supporting new style features, may contain other things as commit was delayed. Removed old dictionary set.