Simplified submission implementation and added extra metadata to be save

...d. Still needs the jar version.