Added verify meta data and verify step
Cleanup