some refactor
TODO - common handlers classes