Add @username retrieval