moved to more generic resource stores