Move these to the abstract for convenience