Fully add fragment support