Ongoing code review of plugin