Added more defintions