Add new context classes