Changed a few interface definitions