Added support for model endpoints