Updated the interface definitions for draft no. 2