Updated package to return model object