Added nickname support

$