Updated view to use base model
Updated view to use service