Return data type are now more consistently