More work on the RSD file loader