Little changes to retrieving values