Added logging interface
Updated dictionaries