Added custom nick support