Issue #27 - convert MPD construction to the builder pattern