Removed hard coded paths