improved entity override capabilities