Builder: Removed self closing tags