added plural model type
removed ready for production use