Adding support for Faces and Keyframes