Changed some parameters avoiding namespaces dependecies
Minor changes