Moved extension code to root