New objectypes + update maps