First step in replacing S3 refs with local DB