Dictionary improvements