Extracted common method. Added explicit paths.