[UPDATE] Some structure changes