Added wrapper classes