CVJ-92: Reworked suspend so that information is store in own table rather than changing the dataset type.