Added a bit more info in the return