Add support for model specs