Added wrapper functions