Added "Main" class + XML changes