Polishing

Move callback interface into adapter as a nested interface.