Add more guards