Further simplifies adapter interface