Database structure and classes modified