Todo: Check if dictionary is made ok