Class dependencies bugs fix. Problem with bundler will be fixed in the next version