Updated to use file constants.