Added plugins, folding, etc...