- registration optimisation WIP

Signed-off-by: Eugene Dimitrow <e.dimitrow@gmail.com>