Updated context to use the right xml dependencies