Superficial changes
Reorganized to support batch publish