Changing mind again about schema format
Clean up getEntry and fullPath