Code with db changes