Proper line spacing
nb-configuration is apparently created
Update references to new handler objects