Expand db class
Add Data class