Fixed and added 'application' specific issues and functionality