updated with db classes
updated