Changed move architecture.