Various changes to create access to sctructures and elements