md-poc: credance-poc: Made object builder type safe
md-poc: credance-poc: Finished object builder type safety