Rc1/feature/new structure