Big overhaul to include database use cases