Added several new features