Updated base adapter interface
Merge