More refactoring. Started adding dummy metadata access.