Adding little more features