Improved organization and ancient date support