More work on backup class