New properties file & code updates