Refactoring
Removed GuidBuilder completely