Wrapper classes added.