Added year parameter to from_data