Add more protect & design