Version that uses plugin registration