Refined the class structure