Updated the interfaces to match #6.