Separated Data into it's own Handler as it wasn't really part of the API to beging with.