Improve status return