Make the return value more strict
Ensure stricter implementation of the storage adapters