Reconsider main class usage