Update/improve the get() method