Implemented proper last_name handling