improvements of the Fragment integration