Added adapter layer