Moving more code to new storage adapter system