Added Modman support