Update classes under structures to work with super class.