Add code for solaris