Simplified protocol logic & add set file