#237 - Builder namespace