Added defintion, handler, registrationer and runner
some renaming