Changed dictionary format