added support for numbers (vs strings)