Added full file support