Make the context argument optional to ease migration