Improve data management
Last changes