Added a few features
...