Added modman support