Refactor
Upgrade savanna_commons to 0.4.2