Changed application classes to work according to project requirements