Added Boolean support to Generator and removed incorrect toString for all keys when working with maps