Udpate services which validate and read the property file
Add top level execeptions