Good Point on data refactor