Several feature addded