More improvements and plugins