Added and changed definitions.