I agree that the context will be better and I'm planning to add it in the next releases.