Added dependency and handler