Some improvements in the object and item definitions.