Add a few more object types.