Adding initial wrapper classes