Prepared for future import from JSON
Refactored to avoid important