Add some more context to the arguments