Add short options to data.py