Updated lab class structure