Length limit fixed and dictionary updated