Added address controller and updated model