Update module to work with datamodel 0.3