Refactoring of the whole framework to work with value based handlers