Some updates related kommodity :D