Implement some new features