added backward compatiblity for data migration