Added code to handle nested context classes.