Adding general structure