Added 5 more security checks to be added before final 1.0.0