Actually return values instead of ids