Added basic mac support