Added more features - Khang