Updated for init command, defineModel with db = false and surrogate -> self