Add manager and wrapper classes