Application now uses Traits + Various corrections / improvements