Main class changes - Added main method