Added code to normalize paths