Added isWhitelisted