Added proper activate/deactivate for dictionaries