Updated class structure