Complete basic wrapper implementation for all needed interfaces
Add new wrappers