Updated and optimized a few classes.
Updated and optimized a few classes.