Class renamed to be more general.