Resturctured FileMap and added some secondary features