Adopted a more cleaner approach to modeling the structures