Added necessary wrappers