Fiber support

and changes for v4 compability