Added more features required