Replace deprecated method
Reformat
Add NoBuilderServer