I'd love to see support for these two added. If there is some easy way that I'm missing please let me know.