Many tweaks & fixes. JujuMapper module added.