Back to a clean phantomas version + modules