Restructure signatues for easier addition of meta options
Add options to metadata
Remuved unused code to create a reader