Plugin Registry and fixed errors