Updated to use Common functions for path to currently executing file.