Add context to command script containers

This is probably needed.