Added main class and UUID support