Fixed the animator and animated interfaces to remove duplication