oath and survey base models added