Added builder code