Support meta keys with hyphen #248