Linux - update code to work with refactored Nativity