Add Solaris Support and Eridani-2