Removed first/last name dependency (closes #329)