Updated with plugins