Added several support for new features