Additional security changes