Jay: Wrapper classes added.