Added placeholders in builder, fixed a builder bug