Update return values for better useability