Adds keyframe support