Better installation setup