Move metadata params to their own location
Refactoring for cleaner separation