Decomposed and Refined Ready for adding FMI implementation details