Updated installation routines