removed sub classes of dataAPI made them functions