Extended database controller, style corrections