Improving from dict