Overall module improvement
Version bump