Add service classes to storm.py