Added consistent move support