Refactor responses to always contain status with data payload