Refactor structure feature