Refactored dict.jl