Structure update, refactoring