Added new main class