Improved method and class structure