Made wrapper functions a bit better