Add inheritKeyword
Modify Types