Added assertions model and controller