Added support for molokai