@qlobbe thanks for the comments about the usage of the types, they cannot be merged into dev due to merge conflicts but that's already helpful ;)
dev