Add more features and options