TW custom entry handler update