DEV: Add wrapper (smart pointer)