Added implicit dictionary keys support, fixed container item type calculation