Improvement/iterate over dictionary instead of attribtues