Improved MacOS functionality and added an example scenario