add some wrapper classes