Moved some plugin extensions into core