Adding Structural Adapter impl and test