Fixed database passing