#263 Finish the interface