Complete feature #26: Improve animation performance