Adding updated #* dictionary functions