Improve defaultData method

result type changed to Generics Type