added handlers + updated providers