Added maximum files and maximum length support