Vim structure improved