Made PaperTost more flexible