Added/modified database models