Added more features (All single ones)