Added security relevant classes