Work on grid integration and addon support.