Added whitelisting to core