Added better dependencies order