Move to Storage (core module) instead of Clone