Added dynamism to these classes.