feature | moved handlers to a more general place