Started working on ability to map adapted types to adapters