Add back all remainings things but installation