Adding initial class structure