Changed some wrappers