Added BuilderGenerator and misc utility methods