Removed strongly typed classes.