Minor update to dynamics/structure to check if they have contents