Some missing adaptions for new format