Implemented few features