Added a few features