First commit with updated modules (mojito 0.9 ecc)