Further worked on FMI container for #27.