Moved 'result' into 'database' as the actual class is a database result + added