More application data, improvements in the markup