minor changes in application classes