Refactor structure type handling