Major refactor of logic into adapter context for all adapters