Updated files from MC changes and several new ones.
Signed-off-by: Michael J. Messano <mmessano@dexma.com>