Add context wrappers and class names