Implement more features