Expose some more information through the API in a better way