CM: add Storm dependency
CM: boilerplate work