Change: interface used in metadata instead of database class