Wrappers refactored into specific cpp files