Created wrapper and proxy logic