legacy handler updates