Added structure and skeleton