Make more hard coded values into properties.