Added system properties to control generated size