Add missing interface file, add TODOs for error handling