added createdBy user id in addition to username