Updated gemspec and some classes to add a module