Improve geral structure