Expanded structure a little