Converted all builder classes to static, to prevent losing the type information