refs #1517 Some API updates