Added market module (untested)