Updated to populate from JSON