Update of structure to more simple