Move configuration handling