Added model and controllers