Updated internal references