Added nickname support