Added some features and tests