Revisions to the abstract class