Adding some modifications to older classes