Upgrade schema and add more information
Fix spacing and more information