Separate wrapper classes in corelib