Imrpoved get method