Adds more security checks