Feature/database staging