Updated to include usage of new filesystem