Added better installation facilities