Additional work on console app