ContextAwareBase constructor now takes a ContextAware instead of Object