Added plugins and better aliases