Add ability to disable automatic animation