Moved some more hard coded values to properties file