Moved conversions to common.py