Added some minimal retrival behavior