Fix for status codes returned when resource not found
Updated DAO interface to use Futures