Add more strictness