Update application structure. Fix format identification