Added more structure classes
Added structure methods