Improved some internal structures.