Feature/use database