Update the structure and some new features