This commit only defines the structs and makes sure that the
construction is still valid, but does not implement the usage of the new
structs.