Fix the last issue and add the get for names