Updated face names and added inheritance