More features added <Shashank>