Several new features added