Added more OS X functions