WIP - Update user classes

Databases