FileDB - More work done on class saving