Modified all classes in order to pass a dict with all the parameters that are needed (this way is cleaner IMHO)