Add more object types