Adapter Interface restructure