Database source refactored
Identifying storage options