Implement new features