Change import order
Add Database class