Increase speed of construction of the class structure