Solaris support v2