Added more classes and console application