fix(builder): fix json unmarshalling
fix(builder): change templates