Better structure of the application data