Refactored and simplified Builder-Support
Refactored and simplified Builder-Support
Refactored and simplified Builder-Support
Refactored and simplified Builder-Support
Added changenotes