fixed: adjust to data slot handler changes