Cleaned up wrappers