Added adapter wrapper classes