Add option to enable change animation