BUILD-436 I think we need type as well, although it's not documented