Added caster whitelist support