Tweaks to Animation class to make it more flexible