Further refined three way feature model

Also added export for supervisor meeting