minor update
Automated two data structures from core.py