Make animation property optional and Fix a state loading bug.