Added basis of class structure