Upgraded module for Zorba 3.0