Change input format, added support for mutli-year