Minor changes
MetadorController refactored
Minor changes