[0.0.4] Better deps handling