Improve of class structure