Add better data representation