topic handler changes