Refactor class Data, add few new classes