* Updating with upstream
* Adding a "Get by ExternalID" function for convenience