Add more features and examples