might makes sense to have a container class for those. but its a non-BC-break change so i don't mind if we leave it for now.