Better installation perfomance