Small addition, also returns type in result