Added wrappers

Major changes