Feature/allow modifying context in commands