Be more careful when replacing .storage and .backend