Work around back end storage