Add more wrapped functions