Make module work better with vas