Added model_type constants and D constant