DATA API modified