Customizations for classes

Made updates to match other library products