Separate builder code