Added some features that I (@dpp) would like