Improvements based on changes related to plugins