Extended the adapter interface slightly.