enhance metadata and persistence provider support