updated adapter to reduce dependency