Added Basic class structure