Implemented property support, so filelocation are not longer required to be hard coded.