Added support for Apple