moved filed management to this level