Big changes on 2.5 plugin
Big changes on 2.5 plugin