added white list mechanism